merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 9 Aug 2006 16:32:23 +0000 (10:32 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 9 Aug 2006 16:32:23 +0000 (10:32 -0600)

Trivial merge